Make movement by paragraphs up/down symmetric. (#307055, Behnam Esfahbod)

2005-06-24  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c
	(gtk_text_view_move_cursor_internal): Make movement by
	paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)

diff --git a/ChangeLog b/ChangeLog
index 69b608918707e4ef82cb9dbf20465d36f38ed7b5..dcb9203627cd7e054d21acaad92c5ded7a614240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
 
        * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
        jump to the next line if we are at the end of the line.  
+       (gtk_text_view_move_cursor_internal): Make movement by
+       paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)
 
 2005-06-23  Tor Lillqvist  <tml@novell.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 69b608918707e4ef82cb9dbf20465d36f38ed7b5..dcb9203627cd7e054d21acaad92c5ded7a614240 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -9,6 +9,8 @@
 
        * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
        jump to the next line if we are at the end of the line.  
+       (gtk_text_view_move_cursor_internal): Make movement by
+       paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)
 
 2005-06-23  Tor Lillqvist  <tml@novell.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 69b608918707e4ef82cb9dbf20465d36f38ed7b5..dcb9203627cd7e054d21acaad92c5ded7a614240 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -9,6 +9,8 @@
 
        * gtk/gtktextview.c (gtk_text_view_scroll_hpages): Don't
        jump to the next line if we are at the end of the line.  
+       (gtk_text_view_move_cursor_internal): Make movement by
+       paragraphs up/down symmetric.  (#307055, Behnam Esfahbod)
 
 2005-06-23  Tor Lillqvist  <tml@novell.com>
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index e22913cf87d5f89c2bb25cd35b00b9baf707f029..2a11b9ef91290f430725382340973ab0739a70d0 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4752,8 +4752,6 @@ gtk_text_view_move_cursor_internal (GtkTextView     *text_view,
       break;
 
     case GTK_MOVEMENT_PARAGRAPHS:
-      g_print ("move paragraphs: %d %d\n", 
-              count, gtk_text_iter_get_line_offset (&newplace));
       if (count > 0)
         {
           if (!gtk_text_iter_ends_line (&newplace))
@@ -4767,10 +4765,7 @@ gtk_text_view_move_cursor_internal (GtkTextView     *text_view,
       else if (count < 0)
         {
           if (gtk_text_iter_get_line_offset (&newplace) > 0)
-            {
-              gtk_text_iter_set_line_offset (&newplace, 0);
-              ++count;
-            }
+           gtk_text_iter_set_line_offset (&newplace, 0);
           gtk_text_iter_forward_visible_lines (&newplace, count);
           gtk_text_iter_set_line_offset (&newplace, 0);
         }